Fix #85 with FLUME-2174 patch