#10054 bug fixing