Oops... Broke the unit tests... Now fixed.