Moved check for prompt out of the conditional for context override.
5.0.5