bugfix in BNDM