Fix to be more continuable friendly.
Make more continuable friendly.