Merge pull request #2504 from ludovic-henry/fix-console-error