Hotfix for version compatability