PMO-2831:fixed stackoverflow error