workaround regression