fixed safe-eval