Hotfix for OS import