fix broken code after merge