Issue 889 & 890 Discussion