Issues with wrong prefixes resolved