Fix #52, short circuit on selected values