some fix with new problems -.-
some fix with new problems -.-