fixed OK-339