Bugfix on select return