Multi user bug fix