Yes - @ramonza if your fix is only for flushing, please avoid making other changes - in particular `+`ing strings together.