More proper (9/48)

More proper