Fixing Image construction, fixes #172