Adding fix for image handling