Potential patch for an Issue #914