Refine commit d929345