Fixed "ESTEST-97"