Updated fix for issue #381
Merge pull request #456 from blackberry/next-381-1

Updated fix for issue #381