Repaired bug: showing notice 2 times