Prevent duplicate, improve logging