Restrict CVC length bug. Fixes #21.