Fixed storyboard issue see diagram