Attemtpt to solve #91.
Issue #91 fixed.