copy paste bug fixes