Fixed issue #1261