Fix Melchior and Penny