compsensate for core refactor