Fix #68, fix #67