Fixed issue #104