Fixed Uniforms being added twice