Fixed issue with multiple files