Fixed issue #304.
Merge pull request #325 from blackberry/next-304

Fixed issue #304.