Fix #29, fix #30.