Fix for THUCYDIDES-205