Stefano hotFix
Merge branch 'hotfix/StefanoHotfix'