yet more fixed handling of image type