Minor patch for an Issue #802