Bug Fix for Java 7+