[BUGFIX beta] Does not disregard currentWhen when given explicitly.
FIxes #4688