Fix for LOGSTASH-1983