Selectfix

Here's the proposed fix issue #84