#12: Make variable pattern less strict