Attempted fix for entities blanking out