Fix enhancement #26