Bugfixing - map button