fixed doubi issue