More proper (18/48)

More proper