Fixed right-part-non-evaluation bug