Fixed issue #451
Merge pull request #454 from blackberry/next-451

Fixed issue #451