Motor disarm fix - to validate