Fixing of Map remove