Make source 1.6 compliant