Fix #68