Important fix for storyboards