Fixing error in refactoring.
Merge pull request #40 from Gonthim/master

Fixing error in refactoring.