Fix bug in prefixing scheme