Replace static by self