Fixed ISALE-148
Fixed #VTA-589.
VTA-590 eof.