Fixing regression issue introduced by refactoring
Fixing regression issue introduced by refactoring

timothyakampa/RapidFTR,timothyakampa/RapidFTR,sferik/RapidFTR,mwangiann/RapidFTR,tomclement/RapidFTR,sorashiro/RapidFTR,austiine04/RapidFTR,ctumwebaze/RapidFTR,tomclement/RapidFTR,sferik/RapidFTR,sriprasanna/RapidFTR,mwangiann/RapidFTR,mwangiann/RapidFTR,ctumwebaze/RapidFTR,ctumwebaze/RapidFTR,rapidftr/RapidFTR,sriprasanna/RapidFTR,sorashiro/RapidFTR,austiine04/RapidFTR,sriprasanna/RapidFTR,tomclement/RapidFTR,tomclement/RapidFTR,ctumwebaze/RapidFTR,rapidftr/RapidFTR,mwangiann/RapidFTR,austiine04/RapidFTR,sorashiro/RapidFTR,sorashiro/RapidFTR,rapidftr/RapidFTR,timothyakampa/RapidFTR,rapidftr/RapidFTR,austiine04/RapidFTR,timothyakampa/RapidFTR,sriprasanna/RapidFTR,sferik/RapidFTR