temporary patch for Issue #212