CAAERS-7013, changed for compatibility with java 1,6