Help needed for #909 and #910