Fix hardcoded valid_options override

Fixes #25