Fix enhancement #66