Fixed issue #1127