More image capture fixing.