Bug fix - storyboard