POC fix for #47