Fix cut and paste