Fix for new autowoot code