Should fix all multi-user issues