Feature/fix interval