Fix issue with picks being unnecessarily saved