Fixed storyboard bug