fixed bug due to refactoring