Bug fix in BDF2