Fixes BH-19