solved issue #85