Fix #67