Fix Matchnick.... Or whatever was wrong with it