Quick and dirty fix to problem - WIP