make compatible with java 6 once again