Fixed processing about delayed && and ||
Fixed wrong prim detection