fine tune feature ZK-1672