fixes #884
Merge pull request #889 from magfest/placeholder_fixes

fixes #884