Quick and ugly bugfix