Cm 10.1

Fixed the errors in last commit