Fixed issue #137