fixing multi-user hopefully