Fix Issue #1044