fixed regression in previous merge
Merge branch '3.0'