Hotfix for version 1.4