#142 fixed