Fix enhancement #53