Good point. Updated PR together with your comment below.