Fixed first evaluation bug