Ah, now I remember what my real issue was. Well, these are two different problems, so should be actually be treated by different commits, with specific comments. Not such a drama here, but in general one commit per bug/issue is easier, so one does not have to do the mapping of code changes to issues listed in commit message.
Please consider doing so in the future :)