Fix cropping issue