Fix base tag problem