Fixes BH-359