[T7] OK e T[10] toFix
[T7] fix
Merge fix