Fix #69 and fix #70