Bugfix: Valid value lookup