Bug fix for nag window