Paranoid hotfix of HotFix for #27