[BUGFIX] fillIn helper should take context into consideration