Hackey fix for #88 since David will never get to do it right :)