Fix for https://github.com/o2platform/fluentnode/issues/14
Fix for https://github.com/o2platform/fluentnode/issues/24