Fixed issue #241
Merge pull request #245 from blackberry/next-241

Fixed issue #241