Fixed # matching code