Bugfix for funny invocation edge case.