Change to cope with no default content