Change to use a null node