Moving the dismissal call to prevent an inevitable merge fail