fixed issue 62