Before fixing follow set issue