Fixing line2 workaround