fixed issue 40 not 42