Fix issue surrounding the missing prefixes.