Feature/fix section controller becomes nil