Fix single image handling