fixed logic for initial request