Fix issue with following for first time