Improve prompt behavior
Fix #202 handler problem