Fix issue with odd image types and expandos

Example: http://redd.it/220qv2