Experimental fix for bug ".bp followed by .."