Quick & Dirty fix to let tests pass