fixed assign/match