a fix
Merge branch 'niklasThing' into dev