workaround chap 11 v1