i think i fixed some issue