Needs a lock here too.