Fix enhancement #63