3.0-dev fix 3