Fixed issue #248