Fixed THUCYDIDES-179