Fixing Issue #12 by reworking how frame rotation is handled