Fix for first request