apply PR 32