Fix enhancement #23