Follow advise in PR 632