Fix issue#5 (exception 133)

More heb support