Fix for #1 that doesn't screw up selection