Fixed double flash message bug