fixed cut and paste issue