Fix for issue#20645