Fix average rate rotation bug