Fixed THUCYDIDES-199
Fixed THUCYDIDES-216