Fixing org and final crop