match bugs fixed