Fixing evaluations and things seem to work