Fix enhancement #41