Fix order of eval problem from when I refactored this into a function.