Fixed wrong controller being called in match method