Fixes BH-286