Fix for new startup sequence