Integrating fix for THUCYDIDES-143 from wikisky