section 3.2 finished: fix #45 and fix #76