Fix unrelated function issue