Add space gaurd for timezone detection r=asuth