Fix #121 eval bug