change message and fix bug