remove chicken/egg error check