Fix issues with the image mode