Revert "temporarily using eval()"

This reverts commit ad646d3cc4361f4c2ece476acd5167f595d3e6bf.