fixed ordering
merge conflicts
Merge branch 'affektive/digiquatics#896'