Fixes PR13406