[Fix #1104] Fix EachWithObject with modifier if