Does this currently fix anything or is it just defensive programming?