fixes #9 and closes BH-9