fixes #8 and fixes BH-8