General entity fix 2