Adjusted condition when TYPE_BOOL is restored
[skip ci]