Solved empty map bug