fix broken code from cleanup