fixing errors
move error fixing