Sophie | #4058 | Some fix