More responsive fix