#85 Replacing image size hack with something simpler