BUGFIX - Removed dependency to java 7