Final path towards workaround for #51