Bug fixing & penambahan message