PROPERLY fix issue #17.