get rid of one more #partial