Hotfix for IO-less systems