Fix enhancement #50