[fixes] - #185, #164, #186