Step 3 of line 1816 fix (must be a version problem??)