fixed copy and paste