fixed OK-341
fixed bugs