fix for THUCYDIDES-189