fix whitelist & no max