Fixed THUCYDIDES-126