Fixes #18, this is tested with the 140 SDK, works fine