applied Sander's drop_bh patch