Fix for very unlikely multi-user clobber issue