Fix cornercase where data would somehow get stale