Fixed Issue #1094