Quick bug fix with notification delay