Fixes BH-9 and fixes #9