Merge branch 'fix' into dev_thiago
Bla
fixing merge