Fixed issue #230