Reapply papel's workaround