Fix for treemap removal