Fixed issue #1235