attempt at fixing follow logic
2.1.2