I will squash the commits. This issue is handled in a later commit