#24 fix selection