hotfix until it's merged into the project