#139 fixed