Fix bug #67