fix for THUCYDIDES-187