Fixing issues with left/right pick