reset to working with java7