fixed issue 61