Fixed userlist and map bug