added 1.6 compatiblity