Fixed issue #1258