Project PR

you may remove L144-146 and just directly return false in L135 and L141 :bow: