Nice fix! Maybe that could go in a separate commit to isolate it from the rest, as this is not a java8 related issue.