fixed issue 780