Bug hotfix, final hotfix, everything appears to be fine