Changed position of the 'match' call