Fixed issue #1134