Fixed issue #251.
Merge pull request #316 from blackberry/next-251

Fixed issue #251.