fix for ie6
Merge branch 'ie'