(#41) - replace eval with Function