a fix for 3.1 (it worked well w/o this in 3.0.2 though...)