fix attribute selection issue
Merge pull request #1323 from dennishendriksen/master

fix attribute selection issue
Merge remote-tracking branch 'upstream/master'