Fix for missing prefixes