double-flash-msg-fix