hotfix for some reported issues with uniforms.
Merge pull request #4732 from DJSnapshot/hotfix

hotfix for some reported issues with uniforms.