Fix enhancement #70