fix compatibility with rest of project after rebase