I'm not sure this bugfix comment is needed. Otherwise looks good to merge