fix before/after