[fixes] - #169, #187