#160 fixed