Bug fix for multiple files: Review correction