Minor improvement
(cherry picked from commit a87a0accc2bde3e7a21307c2e37f7d7a164228dd)