Fix to support older jdk's