fix all current bug