hotfix for live-system issues