Yeah, redefinition fix