fixed issue 86 and 87