Quick and dirty fix to allow the unit tests to pass