FIXES [#52042073]