Small code enhancement according to @tadatuta notation