Fixing NS to CF bridging crash
Merge pull request #1160 from jeapostrophe/master

Fixing NS to CF bridging crash