Bug fix with view controllers affecting iOS 7