Fixes #NME-226.
Merge pull request #45 from itavero/NME-226

Fixes #NME-226.