MB-4 #comment Fix prompt for non-interactive mode