hotfix to remove duplication of flash message