Temporary fix to handle MPB changes