Bug-fix: missed some refactoring