Fix Melchior and Penny, cheers @ninjalulz