Fixed issue #235