Tip entity fix