Fix Storyboard Logic