ticket:5 fix for previous commit: uncommenting code