Merge "Fixed an issue where the falsing classifier wasn't used"