Refactor issue #3195