Fix Melchior and Penny, cheers @ninjalulz
Merge pull request #1290 from Skillert/minor

Fix Melchior and Penny, cheers @ninjalulz