Rewind DI to prevent double up bug