Enabled software flow control to fix Q6 problems