Is this still needed with the fix on line 111?