Added default value to prevent nil comparison