Fix issue#909201