Fixed issues with map