Fix enhancement #62