added better support of Bexp