Java 8 Problems #57 fixes