H1: fix some bugs. Boxing