solved huge bug