fixed bug introduced with previous merge