Fixed pick weapon functionality