[mr] Final bug fix for pull ? :)
[mr] Answer to question in previous commit was: no :)