Merge "Bugfix: Add missing dashes"