Fixed THUCYDIDES-175
Fixed THUCYDIDES-167
Fixed THUCYDIDES-167