Fix whitelist, closes #33