fixed an issue produced by previous merge