FOOB-41 important fix.

FOOB-41 oops forgot one thing.
FOOB-41 Merge branch 'FOOB-41_niffrig_hotfix' into release-1.0