Move code line to do it only when necessary
Move code line to do it only when necessary

lcheylus/haka,lcheylus/haka,haka-security/haka,nabilbendafi/haka,lcheylus/haka,LubyRuffy/haka,Wingless-Archangel/haka,Wingless-Archangel/haka,nabilbendafi/haka,haka-security/haka,haka-security/haka,nabilbendafi/haka,LubyRuffy/haka