fixed evalue handling