more responsive fix