fixing the after effects of commenting/uncommenting/trial&error strategy.