another 3.0 fix