added eval fix by moving to constantize with whitelist