Fixed the cp issue