rebased in order to avoid a conflict following an erroneous pull request