fixed issue 63