Fixed issue #235
Merge pull request #246 from blackberry/next-235

Fixed issue #235