Fixing the usermap issue