fix some promblem