fix #57, fix #62 (CSS ipv VAF)