Fixed THUCYDIDES-190