Fixed after refactoring in Engine/Core.