Add support for LBVC==6