fixed OK-441
fixed bugs from feedback