fixed issue 1533