Fix enhancement #68