Fix critical SEE bug (take 2)