Merge branch 'Fixing'