Fix duplicate flash messages