Fixes BH-4 closes #4