fixed copy paste issues