Bug fixed initial request

Big fixed on initial request behaviour