Fixed problem of prefixes not being removed.