Engine entity fix