Issue #1 redefinition fix.