Bug Fix: Allow proper compilation in Java 8 environments