fixed crash after refactoring