add BPMap. diff. bug fix