Fixed FB11424
Merge pull request #11 from MadsNielsen/FB11424

FIXED FB11424