fix #68 and #69