Partially corrected rotation issue