Patch Set 1:

alternatively rephrase the commit message such that it is clear that you fix two things. Sometimes we use the word "also" to indicate other loosely related fixes that may be hard to separate after the fact.