hotfix for some reported issues with uniforms.