Fixed issue #254