Fixed #1, no more hideous eval