Fixed eval issues