Using different storyboard as workaround