Fixed refactoring issue
Version bump