Component picking fixed