fixed regression in previous merge