Fix bug with single/double hyphen prefixing