Fix cropping bug