3.0 bug fixing