Fix for ImageController