Add more prefixes
Ugly patch