Cleaner PROMPT_DELAY solution