Bugfix: Error in Map-Remove function