This might be introducing a bug in evaluation NEW

Troy - can you please check?