Names prefixed with '!' will now not be fixed up