Replaced masterRequest by currentRequest