diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index ba664ac..430946e 100644
--- a/examples/scene3d/scene3d-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -197,7 +197,6 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Dali::Ani
   {
     if(auto actor = scene.CreateNodes(iRoot, resourceChoices, nodeParams))
     {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
       scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
       ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
 
diff --git a/resources/shaders/dli_pbr.vsh b/resources/shaders/dli_pbr.vsh
index 01937ba..fbd5e44 100644
--- a/resources/shaders/dli_pbr.vsh
+++ b/resources/shaders/dli_pbr.vsh
@@ -128,9 +128,13 @@ void main()
   position = bone * position;
   normal = (bone * vec4(normal, 0.0)).xyz;
   tangent = (bone * vec4(tangent, 0.0)).xyz;
-#endif
 
+  normal = normalize(normal);
+  tangent = normalize(tangent);
+  vec4 vPosition = position;
+#else
   vec4 vPosition = uModelMatrix * position;
+#endif
 
   vNormal = normalize(uNormalMatrix * normal);