Possible remedy on issue #13
Fixes #15
Some error fixing