Fixes bugs occurred due to refactoring