Fixed storyboard conflit