Fix classification match to work with live subjects. Close #74