fixed bug on first request