partially fixed issue 1502