Fix enhancement #61