fix #29, etc