all the above fixed in #1368