forgot to fix up some code after rebase hell