Hotfix for last commit