Issue #113 fixing the flash messsage