@jni  no, I think it's better to cover more possible cases. Is it ok for you like this ?