#38 and #32 resolved