fixes all original failures