Fix the finalization and add the image-scaled feature