fixed for bug B70-ZK-2368