Fix enhancement #51