fix bug introduced in other branch