Hotfix, issue 3