Finally fixed issue #99