Converted back to meet Java 7