Fixed regression in refactoring
Merge pull request #99 from elconas2/master

Fixed regression in refactoring