Sachini 1_5: fixing problems in Machinery controller