General entity fix