Fix enhancement #67