BoP fix to end all fixes (1/2)