Fix #19 Avoid using Eval() in CZ