Issue #27 Trying to please Java8 with this hack