Fixed bugs introduced by interval change.