Fixes BH-390