Fix storyboard issue