fixed java 1.5+ support