WIP: Fix cropping