Updated fixing errors