Fix bug with follow option