Workaround for pitch/roll cal