Fixed the square images issue

Not elegant, but I'll look again later