Prevents loss of entries in changes feed, fixes issue #382