Bug fix for store follow