fixes story #51974397