Fix for missing BP references