partially fixing multi-user issue
partially fixing multi-user issue