I think this particular issue is #445. Congratulations... you get another bug fix attached to this PR!