fix for notices on pr 552