Fix enhancement #27