Fix for issues with clock reset and shuffle not being applied to the first of each state.