Fix notices issue
Fixing notices issue - part 2