12th step commit & fixed