Fixes issues with undefined content