Fixed message box issue