Fix to work with prefixs