Fixed map button issue