Fix Issue #1087