Fix for CompositeMap returning null .entrySet()