some_before/after bug fixed