Fixed source 1.6 compatability