Merge pull request #2616 from jaymzh/whitelist

Fix attribute whitelisting