Fixed diagonal speedup