fixed bug introduced in last rebase