FIX: revert picking / zeroing order