Fixed issue #245