Fix enhancement #72