Fix for RemoveWhere