Storyboard bugfix