Fixed the flash messages