Fix fix for notice in 5.3 to actually work