3.0 fix