Fixed annoying popup