repare some problem