More proper (22/48)

More proper