Fix for LOGSTASH-2093