Fix #68 and #69