Handle 1st incremental case properly