Fix an issue where offset would stick even when collection changes