Double declaration fix
Merge pull request #4877 from Ramoonus/patch-2

Double declaration fix