Code

Fixed handling of iv vectors