revert fix of #15 and now fix it really
Merge branch 'nougad-fix-issue15' fixes issue #15