issue 19 - fix performance of activation/deactivation methods