Fixed issue #238