Improve prompt behavior