Bugfix to SubjectProxy pivot handling