Fix for prefixes with hyphen