fixed issue #64 and #46