Hack so will work with bears branch