Added avoid null move trick back in.