Fixed select return type - #225