Merge fix with notification box