Merge branch 'Andrea-Paz-fix'