Issue 230 have been closed together with 119 and 232