fix copy paste issues