Fix #159 (Active/Deactive some functionalities)