Fixed issue #438
Merge pull request #449 from blackberry/next-438

Fixed issue #438