some fix with new problems -.-