Fix
Merge branch 'hotfix/alignments'