TC-1765 - api compatible with java 6