Fix enable/disable event