Fix refactoring oversight
Fix potential notice