Fix issue with storyboard