Quick and dirty fix