temp fix for fenji(possibly not correct)