Pickable component bug fix