Mad Scientist #7330

#479