3.0-dev commit fix 2