Fixed issue #87