fix for preselected values (Issue #404)

This fixes the issue described in #404.