Make #45 #47 Again!