Really really bad hotfix for bug...