fix after before v2