Storyboard is fixed again