Issue #1064