Fixed issue #90