fix: before and after