Issue #1012 Fix