Fixed storyboard issue