Fix enhancement #57