Fixed Storyboard problem