Small fix in code accoring to @tadatuta notation for this pr