fixed C&P bug