[mr] Final bug fix for pull ? :)