Fixed the selection mechanism.