fix another issue related with last refactoring.