Fixed multiple maps bug
Merge commit