Fix Issue #374: Version 1.5.0 fails on JDK 8