Fix for first time fetch.