POC for #1987