Fixed [before] name bug