Try to fix seeking with pr 2579