fix comma after rebase #22