[BUGFIX] fillIn helper should take context into consideration

Fixes regression in `fillIn` helper.