Fixed Eval and handles promises