FIXED
Merge pull request #395 from blackberry/next-366

Next 366