Changed source for 1.6 compatibility