Scanned all files and fixed #2