bug fixed, support