HotFix to mapFilter