fixed #125
removed extra code