I know that it is not consistent (this also induces some problems in risk calculator implementations) and we shall fix that. I would fix such problem before addressing this pull request... What do you think?