Hotfix bug introduced in previous release