Hopeful fix for FB 5423
Merge pull request #206 from unwin/develop+cred-fix-FB-5423

Hopeful fix for FB 5423