fix for 2.1 from ajaxy@