Fix template matching...