SLIDER-334 Modified to be JDK 6 compatible