Context bug + clean Category PreXXX