Fixed issue #26