fixing enable/disable