reflect the static change in test + debug code
merged