Additional fix for pivot based rotating