- fix cut & paste