Fixed THUCYDIDES-246