Fixing issues with square images