Improvement design by @keitakawamoto's advice