Fix for LOGSTASH-1812