bug fix and disable PBD