refactoring, bugifx