Fix enhancement #60