2286: Fixed sbv parsing