eliminate funky double eval - test pass