3rd attempt to fix warning