Merge "Fix code smell"