Coding style fix for merged PR