Erratum: This is another issue than http://www.rudder-project.org/redmine/issues/3170 . But as above, this PR is not mean to fix all bugs at the same time.