Better fix for select!() (commit 041ad2b0a7)