better fix - #192