Fixed THUCYDIDES-141