#150 fixed deactivation mechanizm